Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: auto-set block timestamp for historical queries (#15448) (backport #440) #441

Merged
merged 4 commits into from
May 8, 2023
Merged

feat: auto-set block timestamp for historical queries (#15448) (backport #440) #441

merged 4 commits into from
May 8, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 8, 2023

This is an automatic backport of pull request #440 done by Mergify.
Cherry-pick of 8a66b9a has failed:

On branch mergify/bp/v15.x/pr-440
Your branch is up to date with 'origin/v15.x'.

You are currently cherry-picking commit 8a66b9a20.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   baseapp/abci.go
	modified:   baseapp/baseapp.go
	modified:   proto/cosmos/base/store/v1beta1/commit_info.proto

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   store/types/commit_info.pb.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested a review from a team May 8, 2023 20:39
@mergify mergify bot added the conflicts label May 8, 2023
@p0mvn p0mvn force-pushed the mergify/bp/v15.x/pr-440 branch from 0be736d to 7dd4643 Compare May 8, 2023 21:09
@p0mvn p0mvn merged commit 9310076 into v15.x May 8, 2023
@p0mvn p0mvn deleted the mergify/bp/v15.x/pr-440 branch May 8, 2023 23:13
@p0mvn p0mvn mentioned this pull request May 9, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@p0mvn p0mvn p0mvn approved these changes

Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@p0mvn